Skip to content

Move mbedtls_dev to framework submodule#9094

Merged
bensze01 merged 8 commits intoMbed-TLS:developmentfrom
davidhorstmann-arm:move-mbedtls-dev-to-framework
May 28, 2024
Merged

Move mbedtls_dev to framework submodule#9094
bensze01 merged 8 commits intoMbed-TLS:developmentfrom
davidhorstmann-arm:move-mbedtls-dev-to-framework

Conversation

@davidhorstmann-arm
Copy link
Contributor

@davidhorstmann-arm davidhorstmann-arm commented May 3, 2024 •
edited
Loading

Move the mbedtls_dev python module into the mbedtls-framework repository. This PR pairs with Mbed-TLS/mbedtls-framework#15.

PR checklist

Please tick as appropriate and edit the reasons (e.g.: "backport: not needed because this is a new feature")

@davidhorstmann-arm davidhorstmann-arm added needs-review Every commit must be reviewed by at least two team members, needs-backports Backports are missing or are pending review and approval. needs-ci Needs to pass CI tests needs-reviewer This PR needs someone to pick it up for review component-test Test framework and CI scripts priority-high High priority - will be reviewed soon labels May 3, 2024
@davidhorstmann-arm davidhorstmann-arm force-pushed the move-mbedtls-dev-to-framework branch from 1e91186 to eb11292 Compare May 3, 2024 15:02
ronald-cron-arm
ronald-cron-arm requested changes May 6, 2024
View reviewed changes
Copy link
Contributor

@ronald-cron-arm ronald-cron-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks quite good to me. I can see that the "Move some files to framework repository" commits in mbedtls and mbedtls-framework are both based on the same commit: 61734ec. The one in mbedtls removes the mbedtls_dev files while the one in mbedtls-framework removes all files but the mbedtls_dev ones that are renamed (path change only) (checked with git show 7554102 --name-status in the framework submodule).

Otherwise, have you checked that you can play the same move game subsequently on another set of mbedtls files, tests/data_files/* for example without merge trouble in framework?

@davidhorstmann-arm davidhorstmann-arm mentioned this pull request May 7, 2024
Merged
@davidhorstmann-arm
Copy link
Contributor Author

davidhorstmann-arm commented May 9, 2024

Otherwise, have you checked that you can play the same move game subsequently on another set of mbedtls files, tests/data_files/* for example without merge trouble in framework?

I have now added to the script so that it can do this. The result is in Mbed-TLS/mbedtls-framework#18, which is based on the corresponding PR in the framework submodule.

@ronald-cron-arm ronald-cron-arm requested a review from bensze01 May 13, 2024 12:20
@ronald-cron-arm ronald-cron-arm removed the needs-review Every commit must be reviewed by at least two team members, label May 13, 2024
ronald-cron-arm
ronald-cron-arm previously approved these changes May 13, 2024
View reviewed changes
Copy link
Contributor

@ronald-cron-arm ronald-cron-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks. There is a conflict with development now thus you will need to rebase though.

@davidhorstmann-arm
Move some files to framework repository
6343a83 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Add framework/scripts to scripts_path.py
1131318 
This allows test scripts to find the new mbedtls_framework module.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm davidhorstmann-arm force-pushed the move-mbedtls-dev-to-framework branch from 2df41f2 to 47fff1e Compare May 13, 2024 12:49
@davidhorstmann-arm davidhorstmann-arm mentioned this pull request May 13, 2024
Merged
4 tasks
@davidhorstmann-arm
Update references to mbedtls_dev
cd84bb2 
Change these to point to the new mbedtls_framework module in the
framework submodule.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Add framework_path module
875c32f 
This allows scripts in the scripts/ directory to get the path to the
mbedtls_framework module in framework/scripts/

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Add mbedtls_framework to mypy checks
299e741 
Since this python module resides in the framework submodule we must
add an extra explicit path to it for mypy.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Update framework submodule to tip of branch
6c0e362 
This allows us to use the mbedtls_framework python files moved there.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Rename framework_path to framework_scripts_path
ecd6d01 
This name is more descriptive of its purpose, since it actually adds
framework/scripts to the path rather than just framework/

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm davidhorstmann-arm force-pushed the move-mbedtls-dev-to-framework branch from 47fff1e to ecd6d01 Compare May 13, 2024 13:43
@davidhorstmann-arm davidhorstmann-arm added needs-ci Needs to pass CI tests and removed needs-ci Needs to pass CI tests needs-backports Backports are missing or are pending review and approval. labels May 13, 2024
@davidhorstmann-arm davidhorstmann-arm added needs-review Every commit must be reviewed by at least two team members, and removed needs-reviewer This PR needs someone to pick it up for review labels May 13, 2024
ronald-cron-arm
ronald-cron-arm previously approved these changes May 21, 2024
View reviewed changes
Copy link
Contributor

@ronald-cron-arm ronald-cron-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've checked the rebase. LGTM, thanks.

bensze01
bensze01 previously approved these changes May 27, 2024
View reviewed changes
Copy link
Contributor

@bensze01 bensze01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I've also checked the moved scripts, and they are up to date with the tip of development.

@bensze01 bensze01 added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, labels May 27, 2024
@ronald-cron-arm
Update framework submodule to the merge of Mbed-TLS#15
a7ec5c8 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
@ronald-cron-arm ronald-cron-arm dismissed stale reviews from bensze01 and themself via a7ec5c8 May 27, 2024 15:52
@ronald-cron-arm
Copy link
Contributor

ronald-cron-arm commented May 27, 2024 •
edited
Loading

@davidhorstmann-arm @bensze01 I've just updated the framework to the merge of mbedtls-framework:#15.

davidhorstmann-arm
davidhorstmann-arm commented May 28, 2024
View reviewed changes
Copy link
Contributor Author

@davidhorstmann-arm davidhorstmann-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Framework update LGTM, thanks!

ronald-cron-arm
ronald-cron-arm approved these changes May 28, 2024
View reviewed changes
Copy link
Contributor

@ronald-cron-arm ronald-cron-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM up to the last commit and @davidhorstmann-arm checked the last commit.

@ronald-cron-arm ronald-cron-arm requested a review from bensze01 May 28, 2024 15:02
bensze01
bensze01 approved these changes May 28, 2024
View reviewed changes
Copy link
Contributor

@bensze01 bensze01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@bensze01 bensze01 added this pull request to the merge queue May 28, 2024
Merged via the queue into Mbed-TLS:development with commit e3abb6a May 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ronald-cron-arm ronald-cron-arm ronald-cron-arm approved these changes

@bensze01 bensze01 bensze01 approved these changes

Assignees

No one assigned

Labels

approved Design and code approved - may be waiting for CI or backports component-test Test framework and CI scripts priority-high High priority - will be reviewed soon

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@davidhorstmann-arm @ronald-cron-arm @bensze01